From 884609c12f8c9762dceb9e3fa68c1811f14b3128 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 12 Jan 2005 09:13:37 +0000 Subject: [PATCH] bitkeeper revision 1.1159.217.9 (41e4ea41-PFvthJ_X2r27xBL8jEH1g) Fix tools compilation. --- BitKeeper/etc/ignore | 21 +-------------------- tools/ioemu/Makefile | 10 +++++----- tools/ioemu/gui/Makefile | 2 ++ tools/ioemu/iodev/Makefile | 2 +- tools/ioemu/memory/Makefile | 1 + tools/ioemu/memory/misc_mem.cc | 2 +- tools/libxc/xc.h | 3 +-- tools/libxc/xc_linux_save.c | 1 + 8 files changed, 13 insertions(+), 29 deletions(-) diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 00addd679e..272e240cbb 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -20,29 +20,9 @@ docs/*.log docs/*.pdf docs/*.ps docs/*.toc -docs/figs/xenserver.eps docs/html/* -docs/interface/WARNINGS -docs/interface/images.pl -docs/interface/images.tex -docs/interface/img1.png -docs/interface/index.html -docs/interface/interface.css -docs/interface/interface.html -docs/interface/labels.pl docs/pdf/* docs/ps/* -docs/user/WARNINGS -docs/user/images.pl -docs/user/images.tex -docs/user/img1.png -docs/user/img2.png -docs/user/img3.png -docs/user/index.html -docs/user/internals.pl -docs/user/labels.pl -docs/user/user.css -docs/user/user.html extras/mini-os/h/hypervisor-ifs install/* linux-*-xen0/* @@ -61,6 +41,7 @@ pristine-* tools/*/build/lib*/*.py tools/balloon/balloon tools/check/.* +tools/ioemu/iodev/device-model tools/libxc/xen/* tools/misc/miniterm/miniterm tools/misc/xen_cpuperf diff --git a/tools/ioemu/Makefile b/tools/ioemu/Makefile index 78a16a7fbd..24215c5a6f 100644 --- a/tools/ioemu/Makefile +++ b/tools/ioemu/Makefile @@ -1,12 +1,12 @@ # Order is important! SUBDIRS=gui memory iodev -all: $(SUBDIRS) +.PHONY: all clean install -$(SUBDIRS): - $(MAKE) -C $@ - -.PHONY: all $(SUBDIRS) +all: + @for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir $(MAKEDEFS) $@ || exit -1; \ + done clean: @for subdir in $(SUBDIRS); do \ diff --git a/tools/ioemu/gui/Makefile b/tools/ioemu/gui/Makefile index 402c70c76d..52ce67bd20 100644 --- a/tools/ioemu/gui/Makefile +++ b/tools/ioemu/gui/Makefile @@ -8,3 +8,5 @@ libgui.a: $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS) include $(TOPDIR)/mk/helix.mk + +install:: all diff --git a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile index 5c251dea8c..1d29463d26 100644 --- a/tools/ioemu/iodev/Makefile +++ b/tools/ioemu/iodev/Makefile @@ -11,5 +11,5 @@ device-model: $(OBJS) $(BXLIBS) include $(TOPDIR)/mk/helix.mk -install:: +install:: all install device-model $(prefix)/usr/sbin diff --git a/tools/ioemu/memory/Makefile b/tools/ioemu/memory/Makefile index cd85cb894f..eb9be7da4b 100644 --- a/tools/ioemu/memory/Makefile +++ b/tools/ioemu/memory/Makefile @@ -9,3 +9,4 @@ libmemory.a: $(OBJS) include $(TOPDIR)/mk/helix.mk +install:: all diff --git a/tools/ioemu/memory/misc_mem.cc b/tools/ioemu/memory/misc_mem.cc index 0c883eb664..51be8cbfb3 100644 --- a/tools/ioemu/memory/misc_mem.cc +++ b/tools/ioemu/memory/misc_mem.cc @@ -80,7 +80,7 @@ BX_MEM_C::alloc_vector_aligned (size_t bytes, size_t alignment) actual_vector = new Bit8u [bytes+test_mask]; // round address forward to nearest multiple of alignment. Alignment // MUST BE a power of two for this to work. - Bit64u masked = ((Bit64u)(actual_vector + test_mask)) & ~test_mask; + unsigned long masked = ((unsigned long)(actual_vector + test_mask)) & ~test_mask; vector = (Bit8u *)masked; // sanity check: no lost bits during pointer conversion BX_ASSERT (sizeof(masked) >= sizeof(vector)); diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h index 8114faafb2..3c4d03cfc3 100644 --- a/tools/libxc/xc.h +++ b/tools/libxc/xc.h @@ -10,7 +10,6 @@ #define __XC_H__ #include -#include "linux_boot_params.h" typedef uint8_t u8; typedef uint16_t u16; @@ -25,7 +24,6 @@ typedef int64_t s64; #include #include #include -#include /* Obtain or relinquish a handle on the 'xc' library. */ int xc_interface_open(void); @@ -107,6 +105,7 @@ xc_plan9_build (int xc_handle, unsigned int control_evtchn, unsigned long flags); +struct mem_map; int xc_vmx_build(int xc_handle, u32 domid, const char *image_name, diff --git a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c index 6d877c84f0..9522446736 100644 --- a/tools/libxc/xc_linux_save.c +++ b/tools/libxc/xc_linux_save.c @@ -10,6 +10,7 @@ #include #include "xc_private.h" #include +#include #include #define BATCH_SIZE 1024 /* 1024 pages (4MB) at a time */ -- 2.30.2